Some Basic Code cleenup and matinence