fixed alignment code
return and indent simultaneously
merged changes.