Clean up whitespace. Rename some member fields