Finally addressed issue, and cleanup