Gradual work on code consistency, both client side and server side