cleaning up code
further cleaning