Refactor after watching solution