removed commented out definitions; pretty printed