Removed dev notes and added better namespacing