Remove setters and cleaning up main method