Add comments; Refactore tests
Remove useless logs
Add structure comments