Fix minor naming convention issues
Add more comments