Refactor

Self-Improvement : Refactor my code !!