Clean up + JSOND code moved