Simplified all the things