Cleaned up slightly