Reformatting!

May not be exactly what I want, may see some change.