Only some code cleanup