Small readibility changes

Made some checking smarter in main and cleaner shader code