App: make code consistent in style