more cleaning up to reduce lines of code