Code was cleaned up