Changed all back to as what it should be. Last time. End of playing around.
Code clean-up.