RELOAD-198 Making code following coding conventions