remove view reference and fetch keys directly // general code cleanup