Align and streamline code between modules