Simple docs and cleaner code