Code cleanup as of Travis error report