Code cleanup: Style (commas after spaces)
Code cleanup: indentation and includes