address @adamrp comments and removed commented out code