Refactoring, added setup activity