changed namespace, some formatting