Modernize action calls and clean comments a bit