Clean up and use proper naming and usage
Relate question, answer, comments