simplify code and possibly use less resources.
more language tweaks