Code review

My initial code review.

Look for me in skype if you have any questions.