Refactored codes by changing names and moving block of codes