this is just a start to cleaning up this file