Amend to prettify code margins