code cleanup. comments, unused logic, etc.