Some small code cleanup
Add production config