Removed some commenting