Reorganized code - Separate function for drawing officers