Code cleaned up..