Minor code tidy up, can't wait for Apple to release the official coding conventions for Swift