Formatting and removal of extras