Revert "Added some finishing touches"

This reverts commit c90b96219443acb11abb537265df283051a8bed1.