Fix code clean-up