Quick cleanup
Updates and credit