readability improvements (new constants/structs)