Improve Angular Sample