Cleanup

some cleanup. nothing major.