Right,some of those can definitely be improved more. Feel free to make a PR if you have some spare time.