general cleanup as I start to get a better naming scheme in place for files