code formatting: synchronization with beta branch