Constants cleanup

Signed-off-by: Dawid Pakuła <zulus@w3des.net>