Added namespace, coding standards