Cleaned up, will maintain from now on with the release tool