syntax improvements

Made it much easier to read i think.