Cleaned up namespaces Renamed a couple of functions and added comments Signed-off-by: Guthrie Adams <guthadam@amazon.com>