Cleaned code

as in topic