cleaned up code so I dont have to make things