Improved readability and structure

Change-Id: I1d07fd7f0bbda63421941c7d77147d1d241deaf7