Clean up profile capturing by using a singleton