Fixed some parseInt calls and did some untabifying