Cleaned up redundant variable instantiation