Address feedback: naming + formatting