Clean up code, fix spacing, etc.