removed some legacy code and improved/corrected some comments