Clean code to respect coding conventions