commit 24

refactoring code