Cleaned up code and README