Cleaning up a bit and moar cables