Cleaned some code..