Freshnel tryout
Code refactoring