Homogenizing the code style, now using 4-spaced intents