changed todos and style