method categorization & cleanup