Update coding style + better Router handling