pedantic - removed warnings