made the code style a bit more constant