Ok, will refactor later today based on all feedback. Thanks.