First-join message delay + some code clear-up :D