Comments and clean ups has been performed.