First pass cleanup on init files

Using after macro
Splitting misc setup from startup items.