Updated commits and cleaned syntax, version 1.1