changed name of header / implementation, improved formatting