checking in
more refactoring