Addressing #24 and formatting