All problems solved + little refactoring