Unused variable removed and aligned properely