Readability fixes

*Note*: WIP