Code improvements to common practices

Just a few code improvements, removing unused directives and redundant code and converting a constant variable value to a constant