Cleaned up some naming, added finish touches so it would output back to stdout