Improved the code base. More to come