Fix style and redundancy