Re-added #ifndef
* Minor tweaks