Eww... inline

Also, the change below is harder to understand, one reason I did it this way was so I could even understand how the code works