Cleaned up some finally methods and removed some blank lines