Minor comments and prepared stop app method.