Added colon syntax support, refactored, commented