Cleaned up Angular code