Removed namespaces and cleared up code and comments