Consistent variable names and proper indent