Cleanup: adapt properties to the style guidelines