code cleanup and commenting