Updates README and cleans up code