Police Department is shaping up