cleanup

fixing bad practices