cleaning up code
continued cleanup