Code formatting
Added three new booleans