clenup and comment