Cleanup a little instance methods