Fixed issue with constants and "self"
Very small refactor thanks to the previous commit