Fixed a few smells