Whitespace & fs cleanup