Add better doc comments