A bit more cleaning/shortening!

Soon I will have to get some heavy testing going on.