Guard - Add method 'id' for retrieve the current user id
Clean up some code.