More formatting, Clean Contact, the lib directory