Reformatted more code according to the Snap fw style