Code cleenup