Remove redundant type specifications

Remove redundant type specifications and bring static method references to consistent style.