Some codestyle and namespace changes