cleanup naming conventions as well as add more documentation