Skip to content

Code improvements

Code improvements #530