fixing some smells