More ruby style fixing