comments added, clean up