Some code shortening