Cleaned up utility classes / methods