Cleaned up logic, removed unworking keyboard error