Revert "Changed variables into one long declaration"

This reverts commit 34469af03f0b53254ae3774ac2ad31a09f80b095.

Signed-off-by: Colton Fitzgerald <rockincolton@gmail.com>