Code clean up, added positional arguments support.