Code cleanup and updated readme