some more clean code