Update: Minor refactorisation + bug fix inside AJAX (self instead of this)