Align code in the codebase