Cleaned up the attrs