Removed sorting in.py, and cleaned up repo;Resolves #39; Resolves #31; Resolves #30