Cleaned some more code.