Some small improvments ... Clean Coding ...