some cleanup
refactor: move stuff from onActivityCreated to onCreateView