Removed the super object oriented part

Found it unnecessary