Fixed batman bug and additional formatting