Updated additional files in lib to correct errors and conform to PSR2 standards