Add removeLeading Formatter to further remove logic from models
Clean up tests