Code cleanup and readme guide updated.