Design adjustments

Cleaned up code of draw function