Cleanup, format, added contributor to license