Reformat, remove unnecessary guard statement