Cleanup: Streamline syntax