Core pr 4

Updated coding style and minimized the JS.