Style fix and delete