Minor updates to formatting and removing debug calls.