Minor fixes: spacing & naming conventions