Improve naming convention + format