- Cleaned up waila class and added a few methods for future use.