general code & whitespace cleanup