Comments added + includes moved to header + using namespaces removed