mogami-common: little cleanup

Signed-off-by: Michael Bestas <mikeioannina@gmail.com>

Change-Id: Ia33f5475d3ef588a930f6a60af44c20bb8cebd51