[UX301] Code CleanUP