code style fixes and added args usage