Organized imports
Added comments, re-organized methods, optimized, removed un-needed comments