Reordered and declared vars for the rest of warnings