Refactored Factory related code a little bit, removed: Activity from them