Formatting fixes, added more detail