Removed some left-over code, to make it a bit more understandable.