Reverted back lost changes from the complex merge

+ my IDE auto-formatted all the code :X