Added idiomatic assignment

Removed functions which became unnecessary clutter.