code clean up! yay!