Cleaned up code and added user ability to delete feeds