Issue landscape

Improve the quality of the code.