styling and cleaning up code

                                                     https://app.asana.com/0/19128794071947/21140848412727
styling and cleaning up code

                                                     https://app.asana.com/0/19128794071947/21140848412727