Formatted and added few more options