cleaning up obvious stuff