Removed temp variables