cleaned up code. removed restbucks specific ones