added bitrate-option, code cleaning