Cleaned up a few usless things, more explicit var names + made it easier to configure stuff