Cleaned up commenmts