more cleaning up code style (might break a few things where constants are used