Adding initial testing and cleaned up more code