Code efficiency improvements, shrink file size, & more