Actually sorted out whitespace discrepancies