Fixed constructor (made private) for singleton classes
Small changes to increase code readability