code cleanup and readme update