Tidying while reading.

Also s/getCurrentUser().getMemberId()/getCurrentUserId()/