Clean up and repo comments