cleaning up, more to come :)