Cleaning up because I'm anal ;)