Reorganize code again
An idea for a second example