Added some smells and looked at fixing the large method