improved readability and added TODOs