Cleaned some code