cleaned up commented codes