Cleanup and memoizing current_user method