changed 2 lines into 1 line conditionals; commented rest of code