Cleaning Up

See the previous commit.