simplifications
code style