cleaned up attributes