Shorten programme a bit