organize code
fixes