Streamlined

So much nicer now.