[sr-dev] [PATCH] Clean up code formatting