Cleaned some code.