Fixing hanging issue and removing whitespace (woo)