Make it look cleaner