Commented visualization part
First improvement pass