Code cleanup and readme file finished