Added logging
Style fix