Cleaned things up and updated the readme