cleanup and basic comments