Add trailing semicolon
Break out column logic into modules