Made it look less crappy