Alignment tweaks
Removed copyright
Merge branch 'copyremove'