Added formatting nonsense and other stuff