Work on refectoring AJAX component