Clean it up a bit, shade the dependencies O_o