style changes and removed unused static method declaration