Use functions instead of class
Use correct name
Simplify
Format