A bit of clean up

Signed-off-by: eldr4d <nikofinas@gmail.com>