Some little refactoring improving usability