removed object oriented code
Merge pull request #3 from cinder1992/master

removed object oriented code