White space fixes

Tests now passing