Indentation and privacy fixes suggested by @aphyr