cleaned up address controller