LUGG-147 : Adding code styling