Added comment and some cleanup