Added more method comments