removed code that doesn't seem to be used
removed unnecessary header & header comments
code formatting cleanup