Clean up and improve small style