Code formatting and better query param support