Cleaned some more code