fixed copy&paste error
fixed some coding-standard issues and removed some commented code
removed some commented code