add better-defaults
add proper identation
drop package extensions