Code-clean-up