Streamline and clarify code.