removing commented out code for cleaner look