Better naming + comments