Issue 92 and code clean up