Making code more readable and adding deps for ws