major commit revamping and standardizing code base