Refactoring
Added fix code issues