Update a bit of style to fix some bugs

Signed-off-by: Joel Fischer <joel@livioradio.com>