Use parent instead of base
Clean up whitespace