Clean up indentation and formatting
Eliminate or suppress unchecked type warnings