Cleanup and adding comments