Cleanup code a bit by removing confusing variable