formating and whitespace cleanup