Clean-up, solved issue #1