some syntax changes for cleaner code