Code cleanup
Add a preliminary entry (wip commit)