Code cleanupt