RELOAD-208 Reformation of the source code