Just removed some redeclarations that bugged me