more cleanup and implementation of get contact