Updated syntax and formatting

Minor streamlining and readability changes