Cleaned up last change