Cleaning up fb code