Issue #2: Fixed formatting of source files