Improved forth style
More improvements to forth style