Clean code
Add Size support