Improved indentation + fixed constructor in token controller