refactored method names, cleanup