Make various changes to code readability throughout app