did some cleanup of files and console logging