Formatting and cleanup, fix legendaries