Code cleanup, added Shark namespace.