more deleting whitespace and stuff