Removed comments, moved code from config