Fix whitespace and alignment
Add backing store