Fixed some small programming style issues