Improve code + p readability