Cleanedup the code