Code CleanUP