Some little refactoring to names and variables