Code cleanup, comments by Bart K.