Clean ups in code