Fixed code review findings
http://issues.team-mediaportal.com/fisheye/cru/MP1-3#CFR-30

+review MP1-3