made 2 methods private, moved 1 method arround