Cleaned up some naming and type usage