corrected some issues with old code and added proper nameing conventions