Minor code cleanup.
Initial code for tick alignment.