Remastered whitespace