Improved architecture, prepared code for cross validation