code simplification
better var name
improve default file
create an entry fragment + code simplification