Make better code structure