Added beautifier, cleaned up JSDoc