Refactored shapes drawing