Added drawing
Small code refactoring