Cleaned up static reference

Added Angular variables instead of static reference