some cleany clean up