updated style and todo