cleaned up code smell :)