Updating some ancient code =)
Following some conventions