adjusted whitespace, ran eclipse clean up, etc