Removed some comments and organised trade listener