Cleaning up + changing some attributes