cleaner conditionals
conditional cleaning; ssr added
Merge pull request #166 from ryanpcmcquen/master

cleaner conditionals