App - tidying up of core code