-Fix: Follow coding style and use s_something for static variables

Also improved comments