Made everything pretty and workable