Pointed out where you might want to change things

@audun- Not exactly sure what is wrong with this. Would you mind explaining in more detail when you have a chance?