Code formatting
Cleaned up formatting correctly template the decoder on the token type
Linting more files
More file formatting and cleaning