code cleanup

code is a little cleaner