better alignment, removed unused lines