Cleanup
Surface: Added getter methods for more Surface property values