Formatting of code, cleanup.