Fixes: Formatting and one variable fix