updated: initial suggested cleanups from peeky.