Updated to remove separators

Giant pain in the ass