Couple of amendments, made local varaibles final