Aw library tidy up