Cleaned main, test listener