Reverting Amars changes

Reverting an idiotic style of programming