First Refactoring - Yes, after 1 day ;-)