scripts: moved decorator to function definitions