Fixed redundancies, commented some potentially dangerous method calls within constructors