(SHIFT) Cleanup code all around

Change-Id: Ibbd7c583a02944d65fd647c2ccd022e24a5a6e9f
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
5 files changed