comments cleaned up