code cleanup and readme modifications