remove lame boolean checks
clean a little
clean a little
clean a little bit more
clean a little bit more