Use consistent style for local const

Should be:

* consistent name with the rest
* static as it is used only once inside the desired method
* const int instead of enum for sanity and consistency

Change-Id: I7a7a7b894a559d03b02a4358c87c464045950253
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Add a missing space to the code

Change-Id: I8e97e51801dbef8154f2dcba1bd2b9464486eccf
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>