working on better naming conventions and tidying URLs