Started applying stricter code standards

Entity.cpp/hpp code reworks.