Refactor: Beautify code/docs