Code Improvement MYG000-98

Code improvements according to @Jero786  comments