[PATCH] Use ALIGN to remove duplicate code