Stramline

Does some bullshit to cut down on the lines of code a bit to make it a
bit better(?)