some cleanup
some cleanup + code update