FIX: Build error due to misplaced colon and style fixes

Change-Id: I2d77430bf36f0f9b54b421fb03fec12c3a67d3f5