Refactored more lines