#61 Cleaned up Javascript side