Added more meaningful comments, and fixed some unnecessary & confusing declarations