Review

Did a small code review and fixed some minor things.