-Cleaned up the class interfaces