Readability

Fixes all over the file