Cleaned up State. Moved public interface to top.