Cleaned up some lines of code