code cleanup

comments added