Cleaned up variable declarations, moved triangleWaveShimmer branch over to master