Rearranged stuff to be neat