Improve variable names
Improve code formatting
Disable IntelliJ inspections were appropriate
Add _ to names where appropriate