refactorings to meet with the coding conventions