Final touches before script splitting

Next step will split scripts to make it more pretty