Added some fixes for my indention woes