Cleanup, FIXMEadds and refactor yowsuo.common.utilities