cleaning up code here and there