Cleaned up a few methods and hidden some for simplicity