added some consts, some cleanup

Signed-off-by: Michal Jarzabek<stiopa@gmail.com>
the convention is to keep lines under 80 chars, could you wrap it please ?