corrected coding style errors and added an additional todo

Signed-off-by: Stefan Venz <ikstream86@gmail.com>