Fix spec and whitespace
Added & support