add some targets, make code more readeable