Simplyfiy code