Reviewing Code

Just reviewing the code.  Did a little tidying up.