Cleaned up some names and removed a duplicate method.