code cleaned a bit-works!