cleaning up code some more...