Some Code shortening, mommma loves shortening too

Finished TODO line 557 ;)