Cleaned up code in Peeplr.Web