basic whitespace and code cleanup