Adds comments and cleans up for production