Some Little Refactoring un tuning process