Simplified

Changed names and removed lines to show an easier template for future
inquires