Whitespace fix and change accessor to give singleton