Comments, usings, whitespace cleanup