cleanup, whitespace, added test