formatting and removal of unused args