Code cleanup
Update credits