Fixed and removed comments in berggren