Fix #48: Clean up syntax per PSR2