Style improvements, fixed static/const/reference