Refactor of lobby