Style and spoiler fix