Cleaning up.
Change compilation flag to be a boolean.
Tidy up a little more.