Code cleanup

Fix indentation, whitespace, etc.