cleanup: some tiny cleanups

Change-Id: I20fc1e2be830fe8600f6778264837ff291dbe7ff
Signed-off-by: Alexander Martinz <eviscerationls@gmail.com>