Clean up the use of attributes throughout