[#117] Make code easer to understand