Clean up naming, formatting, and excess logic