Code Quality - first upload

Created comments, gave better class names, removed unused code, kept
consistency with brackets and other syntax.