requesetiong Full refactor suggestions

Something's up with the tabbing here. Not sure how it looks on you screen. If it looks good on yours, ignore this.