cleanup, comments, refactor
cleanup, comments, refactor

claimsmall/waterbug,nprapps/waterbug,claimsmall/waterbug,nprapps/waterbug,nprapps/waterbug,claimsmall/waterbug,scriptmediala/waterbug,scriptmediala/waterbug,claimsmall/waterbug,scriptmediala/waterbug,nprapps/waterbug,scriptmediala/waterbug