Remove overrides and change whitespace