Fix style inconsistencies and avoid calls to external tools