Le petite refactor