Fix
Cleanup
Fix alignment