changed contructors as well as got rid of commented code