whitespace cleanup, added todos