no errors now
refactor for readability
page working