Order variables by name
Fix alignment of project targets