Improved Readme and cleaned up code