streamline code style