cleaned up code from last commit