:scream: Refactor code