Renamed some labels, a little refactoring