Add rar format support + some format clean-up