Refactoring and some minor changes.
Cleaning action..