Improve code readability and standarise some attributes