Cleaned up some source