removed some comment blocks