Cleaned up unnecessarily verbose code