TODO
readability
improvements