Code cleanup and readme