Comment and code cleanup