[FIX] Minor changes and code style fixes