Demo cleaned up and name-spaced