mostly cleanup & comments