Make instances private
Fix readability