removed commentted out code-moved validation lists out of class