Fix: Minor bugs style