Re-aligned some code