cleaned up reset methods