split out into separate files
remove noise