Version 1.2 - Formatting fixes