Cleaned up variable reuse