added TODO & fixed formatting
added TODO & fixed formatting
added clean