removed some commenting