Code style fixes and feedback from Jake Wharton