code cleanup and updated instructions