Cleaned up some of my existing code