Refactoring.
Work on Declarations