Made cleaner look