Additional edits

Function contents alignment