Clean up warnings
Merge pull request #44 from CS673/cleanup-warnings2

Clean up warnings