Removed setters and improved constructors
Improvements through IntelliJ Idea Analyzer