Refactor styles definitions for better readability
am: e52bb6d189

Change-Id: Id68764235337d45e77d43f56ddd88ac801e0bca1