Cleaned up mess