Move member initialisation out of the body of the constructor, reorganise the header file for ease of reading and alter Makefile as nexessary.