Cleanup comments, removed unused variable