Code formatting
Add comments
Use PI macros