Minor changes, mainly formatting