clean up the code a bit courtesy of Ben Johnson
fixing dropbox weirdness