my version

cleaning up code