added consts, cleanup
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
Merge pull request #3037 from stiopaa1/cleanup

added some consts, some cleanup

Reviewed-by: Loic Dachary <ldachary@redhat.com>