Shortened code

Now the usual stuff is been included, not standalone in every file