removed some comments and cleanup