Refactor and cnn improvements