Cleaning up

Removing some camel case & redundant functions; bug fix & specific
subroutine for each type of call