Improved CI coding standard and added some functionality