Removes cruft, improves layout