@Refactoring code for project