comments added, cleanup complete