Code cleanup and updated README