make it pretty and less ugly also catch more cases of wrong usage