better syntax
cleaned up some nonsense