Post Code refactoring