Align properly and change the constructors a bit