Removed some extraneous code and bang patterns