Cleaned up hooks