Moving defaults to their own file, better inline documentation