cleaning up code #38