Improve formatting/style and add todo