Format code, add comment for common config