Code cleanup
Added a player join listener