Fixed constructors, added two get methods
Removed redundant constructor
Removed unused code, fixed visibility