Minimised unnecessary code