Cleaning + Formatting. Changed 'home' state to abstract (will need to monitor no adverse effects).