Made everything clean and nice