Remove temporary variables
Fix declaration