Legible code
Problems fixed