Removing unnecessary constants + fix to the formatting lib...