cleaning up some code smell