This prevents unnecessary merge conflicts in future. Also code follows a simple formatting rule set and is easier to read.
