Cleanup

Changed few values from PR #42 and #40.