Clean up whitespace issues - still need to add uevents