Refactoring, and lobby removing