Clean up

This commit contains a lot of cleaning and an update to my contact information.