minor refactoring and added assets