Small changes to improve readability

Should help with the upcoming refactor