Code refactoring (mainly formatting)