Added descriptive comments, removed commented out code