Cleaned up code... Added to README new name as well