Code cleanup

- remove unneeded variables
- replace ternary operator with array_splice call
Merge pull request #140 from dregad/hardcoded-strings

Fix hardcoded strings
Merge pull request #33 from mantisbt/master

push origin
Merge branch 'production'