even more cleaning. added command executors