Formatting fixes, removal of unnecessary elements