cleaning up; rearranging...
a little bit more messin around