Further readability

Cleaning