Commit refactored codes