Improving ruby style a bit further, cleaner methods