Cleaned up methods across classes