Match style of other 'match'es
Rename constructor
Wrap lines in an attempt to improve readability