Change unnecessary long variable to short