Cleaned up code for main directory, no functionality changes, updated README