Adding const keyword where possible