cleaned up source for distribution, abit