Namespaced, migrated to Buzz and a little refactor