Cleaned up a little more code