Cleaning up after @trodrigues :)