Minor Changes

Changed variables to one line to save room