added appropriate remarks for Application and Context class