Cleaning up code from last commit