Minor syntax and structure changes for auto_encoders