Code cleanup: Style