Shortening code

Shortened code
Build and return to original

Build and return to original