fixing namespace and aesthetics