Clean up comments  & todos