Better variable naming, remove useless files