Constructor cleanup

It is based on bug_string_amount.