Partially implements blueprint psr-2

Change-Id: Ifd8b7237f650f0f18fa58ab0e870eb2774c776fc