Cleaned up code and updated README