no comment
cleanup + cleancode draft