cleaned up commented code;