Added strict use where necessary