Improve variable names & syntaxe consistency