Cleaned up shader code even further