Cleaned up a few lines of code