Streamline code

Streamline code