Random questions

...dom questions, refactored code