Cleaned up some code in align.c